From bbc7cd2351eac679148a2e0f0bb645db924687be Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 3 Sep 2014 22:44:31 -0400 Subject: [PATCH] GtkEntryCompletion: Treat ::text-column specially Using the setting for this property conflicts with the documentation for gtk_entry_completion_set_text_column() which explicitly states that setting the property directly behaves differently. Concretely, this caused the file chooser entry completion popup to have two columns (with identical content). This partially reverts 331c28b369edae9aa3df2a24833ccb02ef8d7152. --- gtk/gtkentrycompletion.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 567ef689e2..5ab09d99f3 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -372,7 +372,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass) -1, G_MAXINT, -1, - GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY)); + GTK_PARAM_READWRITE)); /** * GtkEntryCompletion:inline-completion: @@ -668,7 +668,7 @@ gtk_entry_completion_set_property (GObject *object, break; case PROP_TEXT_COLUMN: - gtk_entry_completion_set_text_column (completion, g_value_get_int (value)); + priv->text_column = g_value_get_int (value); break; case PROP_INLINE_COMPLETION: -- 2.30.2